accelmap: Avoid a confusing goto
authorTimm Bäder <mail@baedert.org>
Wed, 3 Jul 2019 08:02:45 +0000 (10:02 +0200)
committerTimm Bäder <mail@baedert.org>
Thu, 4 Jul 2019 06:35:34 +0000 (08:35 +0200)
gtk/gtkaccelmap.c

index bbb2dd2bc835cb7b84a1204278332bcffbaf8788..487018e392b1242c1855f6e6128cceab4256b5ae 100644 (file)
@@ -821,13 +821,17 @@ gtk_accel_map_foreach (gpointer           data,
     {
       AccelEntry *entry = slist->data;
       gboolean changed = entry->accel_key != entry->std_accel_key || entry->accel_mods != entry->std_accel_mods;
+      gboolean skip = FALSE;
 
       for (node = accel_filters; node; node = node->next)
-       if (g_pattern_match_string (node->data, entry->accel_path))
-         goto skip_accel;
-      foreach_func (data, entry->accel_path, entry->accel_key, entry->accel_mods, changed);
-    skip_accel:
-      /* noop */;
+        if (g_pattern_match_string (node->data, entry->accel_path))
+          {
+            skip = TRUE;
+            break;
+          }
+
+      if (!skip)
+        foreach_func (data, entry->accel_path, entry->accel_key, entry->accel_mods, changed);
     }
   g_slist_free (entries);
 }